bitkeeper revision 1.1045 (40ec1aa7Tw6ojoQiO9Pu3Cz1YCaofA)

Merge boulderdash.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into boulderdash.cl.cam.ac.uk:/auto/anfs/scratch/boulderdash/gm281/xeno-clone/xeno.bk

diff --cc .rootkeys
index 8a288f2c982dbf6b6b9229c96ec8f88e0d364848,d8edf89b738c62332349e236b29271f038456b95..8b50a8e60dfa89526fff096cb0af3ee5e1710e62
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -352,10 -364,8 +365,9 @@@
  3ddb79bdHqdQpATqC0rmUZNbsb6L6A xen/common/resource.c
  4064773cJ31vZt-zhbSoxqft1Jaw0w xen/common/sched_atropos.c
  40589968dD2D1aejwSOvrROg7fOvGQ xen/common/sched_bvt.c
 +40ec1922He_dRhVJdOicTcHvT8v1NQ xen/common/sched_fair_bvt.c
  40589968be_t_n0-w6ggceW7h-sx0w xen/common/sched_rrobin.c
  3e397e6619PgAfBbw2XFbXkewvUWgw xen/common/schedule.c
- 405b8599xI_PoEr3zZoJ2on-jdn7iw xen/common/shadow.c
  3ddb79bdB9RNMnkQnUyZ5C9hhMSQQw xen/common/slab.c
  3ddb79bd0gVQYmL2zvuJnldvD0AGxQ xen/common/softirq.c
  3e7f358awXBC3Vw-wFRwPw18qL1khg xen/common/string.c

diff --cc tools/python/xen/xend/XendClient.py
Simple merge

diff --cc tools/python/xen/xend/XendDomain.py
Simple merge

diff --cc tools/python/xen/xend/server/SrvDomain.py
Simple merge

diff --cc tools/python/xen/xm/main.py
Simple merge

diff --cc xen/include/xen/sched.h
Simple merge